From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Sat, 19 Jan 2013 17:52:15 +0000 (+0100)
Subject: Notification: fix regression in notification image handling
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5050
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=45fde4888e2d60fe648a0d35992f70701a94ea1a;p=gnome-shell.git

Notification: fix regression in notification image handling

We must set the image after calling .update(), because we're passing
clear: true and thus we're removing the image too.
Also, we need to specify an explicit icon size, or St.Icon will use
the default (48px)

https://bugzilla.gnome.org/show_bug.cgi?id=692091
---

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index f23b268b3..fa1d7157b 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -395,17 +395,17 @@ const NotificationDaemon = new Lang.Class({
         // one of 'image-data' or 'image-path' are specified, we show both an icon and
         // a large image.
         if (gicon && gimage)
-            image = new St.Icon({ gicon: gimage });
+            image = new St.Icon({ gicon: gimage,
+                                  icon_size: notification.IMAGE_SIZE });
         else if (!gicon && gimage)
             gicon = gimage;
         else if (!gicon)
             gicon = this._fallbackIconForNotificationData(hints);
 
-        notification.setImage(image);
-
         notification.update(summary, body, { gicon: gicon,
                                              bannerMarkup: true,
                                              clear: true });
+        notification.setImage(image);
 
         if (actions.length) {
             notification.setUseActionIcons(hints['action-icons'] == true);